General fixes for contributors