Fixing some small issue