Fixed some "to be fixed"