Fixes for awesome 3.5