Fixed some assertions we were hitting in debug builds. Added some FIXMEs.