Some extra, minor modifications