Fixes for method calling.