Fix for puppet errors