Aesthetic/performance fixes