Minor bug-fixes, making specs pass.