Minor bug fixies.