master: Minor bug fixes.