Different fixes. See commits