Small changes to accomodate Mavericks