Small fixes - x1