Fixes for issue_16 T:2h30