Fix distribution & some other misc things