Fixes that Stwalkerster suggested