Make things use the right calls. Bug prevention.