Small, but important fixes