Misc changes from lab