Cleanup + buildfix