More fixes / updates