Addressed a few fixmes