Small fixes related to one dist jar artifact