Fixed deprecated variable accessings.