Fixed/Touchups: various