Bug fixes for 1.5.1