[SQUASH ME] more fixes