Fixes for pull #486