fixes after integration into griffon