Fixes for Jillian
Fixes for Jillian