more fixes :/