Fixes, part 1