Half of the fixes for 3am-decisions code