FIX: Addressing misc comments by Eric