0.67 BETA - Bug fixes