Some quick fixes

Nothing was exactly *broken*, but it never hurts to be safe