Fix some issues staging files and make sure to create wrappers on
sym-links