Fixes for Marco