Two patches from first-time contributer