Added some benekastah-specific customizations