Some fixes / updates