Minor packaging related tweaks to build 1.0.5