Fixes that should've been in last night