Bug #282 : various registration fixes