Some fixes manual