First fixes, not completed