More fixes for life plugin!