fixes for spring file generation