Checking in minor fixes