Micro fixes to the code.