Some script fixes that were overlooked and caused warnings in the dev builds