Core/BG: Add workaround annotation and use exact coords