Final version of ACU fix
Port fix to sACU and clean up whitespace