Fix for config admin & few minor changes