Bugs fixes from 13.0.7

tackling the highest frequency bugs from the last beta release both 13.0.6 and 0.7