Other minor fixes - part 2