Updated Spring Security config, misc fixes