Fixes!

Thanks to Cherry Dan for pointing them out.