Specific Location cleanup/bug fix