Fixing up commits