Misc small updates