Fixes for Inferno