Fixed some most of the errors mentioned in
http://dreamteam.myjetbrains.com/youtrack/issue/Buzz-28
and
http://dreamteam.myjetbrains.com/youtrack/issue/Buzz-27