Fixes to work with scry project