DEBUG DEADLINE: Bug Fix

Small bug fixes