Added some checks and new CodeSourcery