General fixes

General fixes that @GICodeWarrior suggested.