Few fixes

4 jobs for issue_94 in 4 minutes and 29 seconds (queued for 1 second)
latest