Fix problems with stuff