minor fixes for metro