Fixes for 492 and 494 updated...