DevStack bug fixes