Fix testReload KVO warning, other small fixes