Just some misc updates