Small changes to appease JSHint