Little fixes for better module working.