Initial set of fixes.
Fix assets by: 1. no branch and 2. stripping/adding '/'.