Small fixes part 2