fixes to work on jjmacbook