Fixed 3 little fails