Code fixes part 2