Fixed bugs produced from the hlint commit