Added some changes missing from last commit