Fixed some stuff not getting committed.