Bugfixes for buildargs