Fixed up interfaces for logic.js