fixes / extensions