Minor updates for 0.4