Some cleanup of method calls, etc.