Fixed stuff with Types (somehow..)