joshlib compliance fixes