BS: Some production grade changes. Ship it, guys