general fixes
merge fix