Some fixes from testing.
Some fixes from testing.

ErikDubbelboer/disco,beni55/disco,discoproject/disco,beni55/disco,simudream/disco,ErikDubbelboer/disco,beni55/disco,beni55/disco,ErikDubbelboer/disco,mozilla/disco,oldmantaiter/disco,ktkt2009/disco,pombredanne/disco,discoproject/disco,ktkt2009/disco,pombredanne/disco,simudream/disco,discoproject/disco,mozilla/disco,ktkt2009/disco,mwilliams3/disco,mwilliams3/disco,pombredanne/disco,mozilla/disco,simudream/disco,pooya/disco,pooya/disco,mwilliams3/disco,ErikDubbelboer/disco,seabirdzh/disco,discoproject/disco,simudream/disco,mozilla/disco,oldmantaiter/disco,oldmantaiter/disco,simudream/disco,seabirdzh/disco,discoproject/disco,pombredanne/disco,pooya/disco,seabirdzh/disco,ErikDubbelboer/disco,mwilliams3/disco,pooya/disco,seabirdzh/disco,seabirdzh/disco,ktkt2009/disco,mwilliams3/disco,pombredanne/disco,oldmantaiter/disco,oldmantaiter/disco,beni55/disco,ktkt2009/disco