more fixes ... self missing