Code

resync with trunk since these are fixes