Fixes for #203 & #204
Fix for #197: Transform of <use>
Fixes for #197, #190, #184 & #177