Further general improvements