Some fixes implemented