small fixes/cleanups