Fixed Issues and crashes