Bigger fixes for latest RSepc HEAD.