Smaller optical fixes