Fix a couple bugs from review
Fix a couple bugs from review

nadeemsyed/hummingbird,corystone/hummingbird,nadeemsyed/hummingbird,corystone/hummingbird,troubling/hummingbird,redbo/hummingbird,creiht/hummingbird,troubling/hummingbird,creiht/hummingbird,redbo/hummingbird