more fixes :(