Smaller fixes, hlints