Port over fixes from oakland production run