Fixed some pending todos