Resolved initialisation issues