fixed some legacy stuff