Fixed up issues and everything is golden