Fix a lot of things (put & get mainly)