Minor aesthetics improvements