Fixes for loading error