Fixes for pre-alpha-02