small but important fixes