1.5.4, fix warnings