Minor fixes to get fragments, make tests pass again.