bug fixes for big release