Fix basic errors