Small changes to help compiler