mk: Cleanup. Minor fixes