Fixed HSHint warnings