Clean up, fix warnings.