small fixes for last update