Pharaoh: Bug Fixes