Misc updates :)