Commit to fix a few errors with previous code