Misc cleanup and update