Fixed abort conditions and default values