Small Fixes / Update