Fixed stupid API load order, order may need to be tweaked