Some fixes & updates