Minor cleanup and first dist build