additonal fixes