FIX: A few random issues

Nothing major or breaking, just some general cleanup stuff