Resolving bugs and omissions