Few fixes for latest update