correct kernel selected
general fixes