Fixes for default availability