More package updates
Fixes for Templates REST