Fixes, bump to 0.2.5