Tent System Fixes