Some other fixes