Fix numerous problems affecting time expense ext
Merge pull request #623 from jrogelstad/master

Fix numerous problems affecting time expense ext