Fixes according to JSHint