Final Release bug fixes