Minor additions before submit