Giulio/rc fix 20130927

@jrbl - few more changes