Minor Fixes under Mustafa's guidance