Fix PR issues #2