Minor fixes afrer team review