Minor fixes & improvements