Fix uncommited stuff