Corrected 3 issues identified by jlee-r7