few fixes for latest update