Fix PR issues #1