Small fixes for retubing