Spring migration fixes after review