Bug #364, #354
Bug #391
Reset all bugs. Bug project for #407