minor support improvements