Fixes few things