a few changes to allow proper dist builds