Some other fixes...