RC1-1 - Fix Errors