Fixed some last hour bugs