Bug fixes and messages when failed