Schema tweaks [MRB]