PR: #2258 - Fixes for Mario
Resolves: #2255, #2256, #2257
Author: @lissy93
Commit: 8cfa3e727d9f9864c08937b934de3de657c96a6d