Fixed Small Issues