Minor fixes 

Fixes & updates.