fixes / workaround / updates