FIX: Miscellaneous typing errors