BUGFIX: Fix typo and a missing include