Fix some issues with frozen application