IMPROVED : ScrutinizerCI Fixes