some tweaks to accomodate Maverick