Bug fixes with ready messages