Some fixes, part 2