fixes - early beta