Minor fixes, bump to 0.5.5