Copied recent changes to debug versions