Added wrabbit fixes