Minor bug fixes: