Final changes to make JSHint happy