Fixes on fixes. Builds work now (?)