Fixes that should've been in the inital commit