Fix some shit again