DEV: Change stuff so that it will not break the build