Minor compilation fixes
Re-added package for real