Fix refactor happy mistakes