Beta bug fixes