Fixes according to some BDD tests