Small bug fixes
Compiled 1.4 (RC3)