Fixing some Spring Data Bingind issues