FIX: Minor typos and bugs