Fix out of bounds and demolition position