Renaming foreign key fields to always start with lower case
Fixing inprog errors in popup/dialog close