Fixes made based on release validator