Refactoring: fixed warnings.