Fix James Murray's remaining issues