Remove few more errors and warnings.