All these things I've fixed

really haven't fixed much. but Ameer needs a compile.