First fixes