Fix problems with previous commit