Initial debug and fixes - first run success