Fix spring issues