Fixed some basic errors