Other minor fixes