Possibly Fix build server fixes