Opps, fix some basic errors