[Metro] Minor Fixes