Fix some issues for 0.4.19