complete more fixes