Fixing more things… *sigh*