Bug fixes, pillar cleanup