fix a few FIXMEs in srf