Added personal fixes #3