Warnings cleaned up.