Fixing couple small issues