Fixes more define issues