Some small but really important fixes.