Fixes some broken definitions