MINOR FIXES