Fixing couple small issues.