More fixes & improvements