small fixes for past & present