Various fixes, part 5