Small (but important) fixes