Misc changes by Jack