Some fixes added