Simplify/Fix build