And...more fixes