Some Bugfixes for broken Build and Application errors.