More Idiotic Fixes