ASTAR Hotfixes Mark II

Do not merge. This pull request is placed here for communal review while I test it to get some comparisons. 

See commit log for exact changes.