diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm
index 131b7afa..420c4948 100644
--- a/lib/Lacuna/DB/Result/Empire.pm
+++ b/lib/Lacuna/DB/Result/Empire.pm
@@ -542,7 +542,6 @@ sub rpc_count {
 
 sub inc_rpc_count {
     my $self = shift;
-    Carp::cluck "incrementing RPC";
     return Lacuna->cache->increment('rpc_count_'.format_date(undef,'%d'), $self->id, 1, 60 * 60 * 30);
 }
 
diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm
index 842f6bb9..3856d1d2 100644
--- a/lib/Lacuna/DB/Result/Spies.pm
+++ b/lib/Lacuna/DB/Result/Spies.pm
@@ -2333,7 +2333,7 @@ sub prevent_insurrection {
                                                            'Prisoner Transport'] },
                                     empire_id => { 'in' => \@member_ids },
                                   },
-                                  { order_by => 'level', 'rand()' });
+                                  { order_by => [ 'level', 'rand()'] });
     my $max_cnt = $defender->level;
     $max_cnt = ($max_cnt < 3) ? 3 : $max_cnt;
     my $count = randint(3,$max_cnt);
diff --git a/lib/Lacuna/RPC/Alliance.pm b/lib/Lacuna/RPC/Alliance.pm
index 467c4352..e81e6458 100644
--- a/lib/Lacuna/RPC/Alliance.pm
+++ b/lib/Lacuna/RPC/Alliance.pm
@@ -37,6 +37,10 @@ sub view_profile {
     my ($self, $session_id, $alliance_id) = @_;
     my $session = $self->get_session({session_id => $session_id});
     my $empire = $session->current_empire;
+
+    unless (defined $alliance_id && length $alliance_id) {
+        confess [1002, "You must specify an alliance ID."];
+    }
     my $alliance = Lacuna->db->resultset('Lacuna::DB::Result::Alliance')->find($alliance_id);
     unless (defined $alliance) {
         confess [1002, 'The alliance you wish to view does not exist.', $alliance_id];
diff --git a/lib/Lacuna/RPC/Building/Trade.pm b/lib/Lacuna/RPC/Building/Trade.pm
index f93575aa..71083184 100644
--- a/lib/Lacuna/RPC/Building/Trade.pm
+++ b/lib/Lacuna/RPC/Building/Trade.pm
@@ -404,7 +404,7 @@ sub update_waste_chain {
     unless ($waste_chain_id) {
         confess [1002, "You must specify a waste chain id."];
     }
-    unless (defined $waste_hour) {
+    unless (defined $waste_hour && length $waste_hour) {
         confess [1002, "You must specify an amount for waste_hour."];
     }
     unless ($waste_hour >= 0) {
diff --git a/lib/Lacuna/Role/Ship/Arrive/Colonize.pm b/lib/Lacuna/Role/Ship/Arrive/Colonize.pm
index a65b1277..c36da143 100644
--- a/lib/Lacuna/Role/Ship/Arrive/Colonize.pm
+++ b/lib/Lacuna/Role/Ship/Arrive/Colonize.pm
@@ -69,7 +69,7 @@ after can_send_to_target => sub {
     confess [ 1009, 'Your species cannot survive on that planet.' ] if ($empire->university_level < 18 && ($target->orbit > $empire->max_orbit || $target->orbit < $empire->min_orbit));
     if ($target->star->station_id) {
         if ($target->star->station->laws->search({type => 'MembersOnlyColonization'})->count) {
-            unless ($target->star->station->alliance_id == $self->body->empire->alliance_id) {
+            unless ($target->star->station->alliance_id == ($self->body->empire->alliance_id||0) ) {
                 confess [1010, 'Only '.$target->star->station->alliance->name.' members can colonize planets in the jurisdiction of the space station.'];
             }
         }
diff --git a/lib/Lacuna/Role/Ship/Arrive/DeployExcavator.pm b/lib/Lacuna/Role/Ship/Arrive/DeployExcavator.pm
index ade24f6c..2c1e4787 100644
--- a/lib/Lacuna/Role/Ship/Arrive/DeployExcavator.pm
+++ b/lib/Lacuna/Role/Ship/Arrive/DeployExcavator.pm
@@ -54,7 +54,7 @@ after can_send_to_target => sub {
     $archaeology->can_add_excavator($target);
     if ($target->star->station_id) {
         if ($target->star->station->laws->search({type => 'MembersOnlyExcavation'})->count) {
-            unless ($target->star->station->alliance_id == $self->body->empire->alliance_id) {
+            unless ($target->star->station->alliance_id == ($self->body->empire->alliance_id||0)) {
                 confess [1010, 'Only '.$target->star->station->alliance->name.' members can excavate bodies in the jurisdiction of the space station.'];
             }
         }