Fixes for loading errors