Last fixes from MacBook