Clean up some loading issus