Some slight changes for hardcoded things