Minor fixes
Move package