Bug fixes

[merge]