Cleanup a couple of issues based on code validator; update to image