Fix compatibility with Paintings++ (resolves #1 and resolves #2)