FIX: Typos / inconsistencies