Fixed basic errors