Fixing several issues :)