0.2.2 pre-release adjustments