Added some little fixes