some fixes for access