Fix some shit