Made a few updates for compatibility