Fixing few small things