Some minor fixes applied