Minor fixes & updates