Fixed warnings and errorz