small, important fixes