Step zero fixes