Fixes (Thanks: magicyear clarkname)