Fixing Admission & First Trigger issues