Fixes and tweaks
Mergefix