small changes for 0.5.1 RC