This should fix the few issues that are left