Fixed minor annoyances