(m) more fixes