v0.61 Minor Bug Fixing