(m) Minor fixes