Attempts at more fixes