Various fixes, part 6