A few fixes for unneeded stuff