Catch up with updates for ghost 0.4.2