Fixes for errors found.