Bug fixes until the end