[0.3.2] Minor Fixes