Small fixes for Option 1