Small but important fixes