M: warning fixes