Bug fixes, working against staging