Bug fixes attempts