More tweaks to package setup... Still debugging.