Hlint: fixed to eager things
Fixed hlint bugs