[B#1307] Changes based on Geralds comments.