Some fixes applied