Some fixes, getting ready