some fixes ?