8a86e4d more misc little fixes
88cff2b more misc little fixes