fixes applied