Compile fix and another missing include