Fixes/features missing from rebase