Small changes to satisfy JSHint