Fix hornsbys issues