Added missing files, fixed warnings.