Fixed some hardcoded stuff