remove some FIXME
Fix a few FIXME