Fix numerous problems affecting time expense ext