Yet another minor fixes