Fixed various bugs blocking convenience_spec tests