diff --git a/lib/awful/wibox.lua.in b/lib/awful/wibox.lua.in
index 2a155c9b..ad1f7839 100644
--- a/lib/awful/wibox.lua.in
+++ b/lib/awful/wibox.lua.in
@@ -242,7 +242,6 @@ end
 -- If not specified, 1 is assumed.
 -- @return The wibox created.
 function new(arg)
-    local screen = screen or 1
     local arg = arg or {}
     local position = arg.position or "top"
     -- Empty position and align in arg so we are passing deprecation warning
diff --git a/lib/naughty.lua.in b/lib/naughty.lua.in
index 7be4a818..c8a049ca 100644
--- a/lib/naughty.lua.in
+++ b/lib/naughty.lua.in
@@ -261,7 +261,7 @@ function notify(args)
 
     -- beautiful
     local beautiful = bt.get()
-    local font = args.font or preset.font or beautiful.font or awesome.font
+    local font = args.font or preset.font or beautiful.font or capi.awesome.font
     local fg = args.fg or preset.fg or beautiful.fg_normal or '#ffffff'
     local bg = args.bg or preset.bg or beautiful.bg_normal or '#535d6c'
     local border_color = args.border_color or preset.border_color or beautiful.bg_focus or '#535d6c'