Place duplicate bug fix and improvments