Minor bug fixes

@jweakley