Apply some previously suggested fixes