Beta release fixes