Fixed some loading dependencies