Fix dependancies; Remove optional character