diff --git a/data/plugins/skill/runecraft/altar.rb b/data/plugins/skill/runecraft/altar.rb
index d88d4a74..d7b090e4 100644
--- a/data/plugins/skill/runecraft/altar.rb
+++ b/data/plugins/skill/runecraft/altar.rb
@@ -26,7 +26,7 @@ end
 # Intercepts the item on object message.
 on :message, :item_on_object do |ctx, player, message|
   talisman = TALISMANS[message.id]; altar = ENTRANCE_ALTARS[message.object_id]
-  if (talisman != nil && altar != nil)
+  unless (talisman.nil? || altar.nil?)
     player.start_action(TeleportAction.new(player, message.position, 2, altar.entrance_position))
     ctx.break_handler_chain
   end
@@ -36,6 +36,7 @@ end
 on :message, :object_action do |ctx, player, message|
   if (message.option == 1)
     object_id = message.id
+    
     if (altar = PORTALS[object_id]) != nil # Get the altar associated with this exit portal.
       player.start_action(TeleportAction.new(player, altar.entrance_position, 1, altar.exit_position))
       ctx.break_handler_chain
diff --git a/data/plugins/skill/runecraft/runecraft.rb b/data/plugins/skill/runecraft/runecraft.rb
index ae694593..72ebb21a 100644
--- a/data/plugins/skill/runecraft/runecraft.rb
+++ b/data/plugins/skill/runecraft/runecraft.rb
@@ -3,6 +3,7 @@ require 'java'
 java_import 'org.apollo.game.action.DistancedAction'
 java_import 'org.apollo.game.model.Animation'
 java_import 'org.apollo.game.model.Graphic'
+java_import 'org.apollo.game.model.entity.Skill'
 
 RUNECRAFTING_ANIMATION = Animation.new(791)
 RUNECRAFTING_GRAPHIC = Graphic.new(186, 0, 100)
@@ -22,7 +23,7 @@ class RunecraftingAction < DistancedAction
   end
 
   def executeAction
-    runecrafting_level = @player.skill_set.get_skill(RUNECRAFT_SKILL_ID).current_level
+    runecrafting_level = @player.skill_set.get_skill(Skill::RUNECRAFT).current_level
 
     if (runecrafting_level < @rune.level)
       @player.send_message("You need a runecrafting level of #{@rune.level} to craft this rune.")
@@ -41,7 +42,7 @@ class RunecraftingAction < DistancedAction
       @player.inventory.add(@rune.id, added)
 
       @player.send_message("Your craft the rune essence into #{added > 1 ? 'some ' + @rune.name + 's' : 'an ' + @rune.name}.", true)
-      @player.skill_set.add_experience(RUNECRAFT_SKILL_ID, removed * @rune.experience)
+      @player.skill_set.add_experience(Skill::RUNECRAFT, removed * @rune.experience)
       stop
     end
   end