Fix some loading, all works properly now