Further 'use strict fixes'