MInor tweaks