Modifications for 0.6rc3 release