Fixes and changes

[none]