Misc changes from Andy