Fixing some basic errors