Fix package mistakes