Fix some todo