Fixes for Steroids