Various fixes, part 3