Hopefuly this will fix the remaining errors