Some fixes
Merge branch 'core' of github.com:ShaastraWebops/application-portal into core