Establishing some fixes