Modifications for 0.6rc4 release