Fix a couple of bugs landscape.io found.