Fixes for buildbox