again more fixes