Small fixes applied