Crittercism fixes

https://ukengames.atlassian.net/browse/UWARS-4777
https://ukengames.atlassian.net/browse/UWARS-5121