Final issues fixed for 0.5.6