Fixes for Slim