Some modifications to enable easy packaging as an RPM with FPM