Some of this will get fixed when you rebase again on fixes I've asked Ali to make in other bugs.