Fixed nits based on Cullen's inputs