Misc fixes, removed ApplicationName injection