Slight changes to Core draw functions..