Backend changes and Angular hint fixes