More hickup fixes