Moar coverage, fixing brokens