Re: Some bug fixes for the January release