FIX: Small design fixes