More rabl fixes