Temporary program flow fixes