Various fixes, part 4