More projection bugfixes