Fixes and message box