fixes for common data struct init and use