more misc little fixes