Tweaks after PNWScala