Fix warnings and add more details