Bug fixes for Shoebox - Merged from Hydra-spec-pr