Added fixes by sith4life