Beta final bug fixes