Fixes + License