Fixes on Asset model