Fixed a couple errors, all modules compile