Initial Buildfixes

Some clean-up to