several smaller fixes related to static table