some macro fixes for Scala 2.11