småfixes
merge fix