Minor (but important) fixes