fixes for some snags