small changes for compatibility with newer (to-be released) ghcs