Some fixes for integration with syberia