Few fixes

This patch will solve all of your problems, even problems that have nothing to do with programming.