fixes for deferred anti-pattern and incorporating blue bird