Fixes for 0.2.4.8