Fixing some broken shit